[M68k] implement large code model #106381
Conversation
|
Thank you for submitting a Pull Request (PR) to the LLVM Project! This PR will be automatically labeled and the relevant teams will be notified. If you wish to, you can add reviewers by using the "Reviewers" section on this page. If this is not working for you, it is probably because you do not have write permissions for the repository. In which case you can instead tag reviewers by name in a comment by using If you have received no comments on your PR for a week, you can request a review by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate is once a week. Please remember that you are asking for valuable time from other developers. If you have further questions, they may be answered by the LLVM GitHub User Guide. You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums. |
|
@llvm/pr-subscribers-backend-m68k Author: Janis Heims (TechnoElf) ChangesFixes #106208. Full diff: https://github.com/llvm/llvm-project/pull/106381.diff 2 Files Affected:
diff --git a/llvm/lib/Target/M68k/M68kSubtarget.cpp b/llvm/lib/Target/M68k/M68kSubtarget.cpp
index cacdbf559faa2d..00b20966924277 100644
--- a/llvm/lib/Target/M68k/M68kSubtarget.cpp
+++ b/llvm/lib/Target/M68k/M68kSubtarget.cpp
@@ -127,6 +127,24 @@ M68kSubtarget &M68kSubtarget::initializeSubtargetDependencies(
// ---------------------+------------+------------+------------+-------------
// data global big* | pc-rel | @GOTPCREL | absolute | @GOTPCREL
// ---------------------+------------+------------+------------+-------------
+// | Large |
+// +-------------------------+
+// | Static | PIC |
+// ---------------------+------------+------------+
+// branch | pc-rel | pc-rel |
+// ---------------------+------------+------------+
+// call global | @PLT | @PLT |
+// ---------------------+------------+------------+
+// call internal | pc-rel | pc-rel |
+// ---------------------+------------+------------+
+// data local | absolute | @GOTOFF |
+// ---------------------+------------+------------+
+// data local big* | absolute | @GOTOFF |
+// ---------------------+------------+------------+
+// data global | absolute | @GOTPCREL |
+// ---------------------+------------+------------+
+// data global big* | absolute | @GOTPCREL |
+// ---------------------+------------+------------+
//
// * Big data potentially cannot be reached within 16 bit offset and requires
// special handling for old(x00 and x10) CPUs. Normally these symbols go into
@@ -171,6 +189,13 @@ M68kSubtarget::classifyLocalReference(const GlobalValue *GV) const {
return M68kII::MO_ABSOLUTE_ADDRESS;
}
}
+ case CodeModel::Large: {
+ if (isPositionIndependent()) {
+ return M68kII::MO_GOTOFF;
+ } else {
+ return M68kII::MO_ABSOLUTE_ADDRESS;
+ }
+ }
}
}
@@ -212,6 +237,12 @@ unsigned char M68kSubtarget::classifyGlobalReference(const GlobalValue *GV,
return M68kII::MO_ABSOLUTE_ADDRESS;
}
+ case CodeModel::Large: {
+ if (isPositionIndependent())
+ return M68kII::MO_GOTPCREL;
+
+ return M68kII::MO_ABSOLUTE_ADDRESS;
+ }
}
}
diff --git a/llvm/lib/Target/M68k/M68kTargetMachine.cpp b/llvm/lib/Target/M68k/M68kTargetMachine.cpp
index b65de5e177b53e..2248837e6ca61b 100644
--- a/llvm/lib/Target/M68k/M68kTargetMachine.cpp
+++ b/llvm/lib/Target/M68k/M68kTargetMachine.cpp
@@ -87,8 +87,6 @@ CodeModel::Model getEffectiveCodeModel(std::optional<CodeModel::Model> CM,
bool JIT) {
if (!CM) {
return CodeModel::Small;
- } else if (CM == CodeModel::Large) {
- llvm_unreachable("Large code model is not supported");
} else if (CM == CodeModel::Kernel) {
llvm_unreachable("Kernel code model is not implemented yet");
}
|
TechnoElf
force-pushed
the
m68k-large-cm
branch
from
7e844e9 to
4fc8e38
Compare
mshockwave
left a comment
mshockwave
left a comment
There was a problem hiding this comment.
Thanks for the patch! could you add some tests?
TechnoElf
force-pushed
the
m68k-large-cm
branch
2 times, most recently
from
cad9d21 to
b724ce5
Compare
|
Done. |
TechnoElf
force-pushed
the
m68k-large-cm
branch
from
b724ce5 to
b7f2e97
Compare
|
Edit: Apparently this is a known issue with the test. |
|
ping @mshockwave @0x59616e |
|
Are there any blockers to getting this in? Would be very helpful |
|
@TechnoElf Congratulations on having your first Pull Request (PR) merged into the LLVM Project! Your changes will be combined with recent changes from other authors, then tested by our build bots. If there is a problem with a build, you may receive a report in an email or a comment on this PR. Please check whether problems have been caused by your change specifically, as the builds can include changes from many authors. It is not uncommon for your change to be included in a build that fails due to someone else's changes, or infrastructure issues. How to do this, and the rest of the post-merge process, is covered in detail here. If your change does cause a problem, it may be reverted, or you can revert it yourself. This is a normal part of LLVM development. You can fix your changes and open a new PR to merge them again. If you don't get any reports, no action is required from you. Your changes are working as expected, well done! |
5 participants
Fixes #106208.